Merge pull request #13 from colinta/master

Pull requests usually come in pairs, right?