Post authentication and registration.
Fixing PR.
Merge pull request #184 from ngodfraind/master

Post authentication and registration.