make sure the redirect_uri matches
Merge branch 'master' into notification