Extended user

Please check and review new features before merging this branch into master.
Look forward to hearing from you!