Merge pull request #258 from jimdoescode/alternate_oauth