Severe bug fixed for production, the greeting was wrong
Merge branch 'hotfix/0.2' into develop