Merge OAuth lib into this library