Merge pull request #439 from kevinpbuckley/5-7