Merge pull request #680 from jmaas/master

Fix