Merge pull request #408 from kevinpbuckley/5-7