Fixes to latest commit
Merge pull request #705 from EPuncker/master

Fixes to latest commit