Merge pull request #1 from getschomp/master

Pull