Fixin' stuff
Merge branch 'master' of https://github.com/jalagus/glowing-octo-nemesis