Merge pull request #490 from kevinpbuckley/5-8