added OAuth2 support
Merge remote-tracking branch 'upstream/master'
Merge pull request #129 from pizzapanther/master

Added OAuth2 support