Merge pull request #14 from crazzycasper/master

ch