Improve the authorization server response parsing - closes #2