merge is necessary after all
Merge pull request #285 from mvexel/master

hotfix: merge is necessary after all