Merge pull request #520 from kevinpbuckley/5-8