Merge pull request #363 from kevinpbuckley/5-7