Merge pull request #534 from kevinpbuckley/5-8