Merge pull request #495 from kevinpbuckley/5-8