Fix a bug with refresh_token
Merge branch 'master' into bug-400
Add comments