Merge pull request #9 from Aurorastation/master

Update
Fixes!
Merge pull request #42 from skull132/master

Fixes before release