Merge pull request #2 from maxdunlop/master

Pull this