Merge pull request #5 from Strangeblades/RoughCode

Merge pull request #4 from Strangeblades/master
Merge pull request #6 from Strangeblades/master

Merge pull request #5 from Strangeblades/RoughCode