Merge pull request #32 from crumblingstatue/master

Pull me