Merge branch 'master' into dev
Issue #194

UserHelper core functionality ready to use
Merge branch 'dev'