Merge pull request #9 from crazzycasper/develop

Develop
Merge pull request #10 from crazzycasper/master

Merge pull request #9 from crazzycasper/develop