Merge branch 'master' into develop
better registration names
Merge branch 'develop'