Merge pull request #368 from kevinpbuckley/5-7