Merge pull request #479 from kevinpbuckley/5-8