Merge pull request #372 from kevinpbuckley/5-7