Merge pull request #195 from FokkeZB/master

Really closes #190