Merge pull request #531 from kevinpbuckley/5-8