Fix #94
Fix #83
Merge branch 'master' of https://github.com/idan/oauthlib