Resolving discrepancies between User and master

[kenaryn]

Can you please accept the pull request to update master branch with latest changes? (excluding my works on parallel branch on create_Event).