Merge pull request #473 from kevinpbuckley/5-8