Change to Oauth 2

Thanks to Alexandre Mottet for the Java class provided <3