Merge pull request #497 from kevinpbuckley/5-8