Merge pull request #541 from kevinpbuckley/5-8