Merge pull request #5 from Crysco/master

Stuff
Merge pull request #7 from Crysco/master

Merge stuff
Testing. Testing
Merge pull request #9 from Crysco/Crys'-Branch

Crys' branch