Attempted to fix stuff
Merge branch 'master' of https://github.com/Electrolysm/Electrolysm