Merge pull request #13 from crazzycasper/master

ch