Merge pull request #686 from dhardy/master

Fix #682