fixes #191
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf into issue141