Merge pull request #480 from kevinpbuckley/5-8