Merge pull request #194 from notionparallax/issue141

Issue141
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf into issue141