Merge pull request #481 from kevinpbuckley/5-8