Cherry picked ea95a3f to refix #51. Fixes #51
Merge branch 'master' of github.com:Gowiem/Sisyphus