UserHandling added
Merge master