Merge pull request #437 from kevinpbuckley/5-7