Fixes #223
Merge pull request #225 from akkie/master

Fixes #223