Merge pull request #7 from kivra/master

Update to kivra/oauth2 master