fixes #8
Merge branch 'master' of https://github.com/C4ptainCrunch/beta402