Fixes #685
Merge pull request #688 from jacquerie/master

Fixes #685