Merge pull request #361 from kevinpbuckley/5-7