Fixed some stuff
Merge pull request #1 from Nuke928/dev

Fixed some stuff