Merge pull request #512 from kevinpbuckley/5-8