gamewalkers stuff from his fork, back to my master
Merge branch 'master' of https://github.com/sd-demon/herofactory