Merge pull request #378 from kevinpbuckley/5-7