Merge pull request #400 from kevinpbuckley/5-7