Merge pull request #2 from jserpa/master

Pull this