Merge branch 'hotfix/bugFixes'
Fixed a bug with displaying the applet
Merge branch 'hotfix/bugFixes' into develop