Merge pull request #987 from jmaas/master

Fix for #148