Merge branch 'hotfix/v0.2.14.2' into develop
Added user helper and tidied up some files
Merge branch 'release/v0.2.15'