ran mmm for issues #72 and #255
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf