Merge pull request #390 from kevinpbuckley/5-7