Closes #186
Merge pull request #187 from FokkeZB/master

Closes #186