Merge pull request #499 from kevinpbuckley/5-8