Merge pull request #13 from crazzycasper/master

ch
Merge pull request #15 from crazzycasper/develop

Merge pull request #13 from crazzycasper/master