Merge pull request #540 from kevinpbuckley/5-8