Merge pull request #474 from kevinpbuckley/5-8