Merge pull request #398 from kevinpbuckley/5-7