Merge pull request #518 from kevinpbuckley/5-8