Merge pull request #195 from notionparallax/issue141

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