Fixed access token format for oauth authentication
Merged with master