Merge pull request #369 from kevinpbuckley/5-7