Merge pull request #377 from kevinpbuckley/5-7