Merge branch 'hotfix/3'
Upped prot
Merge branch 'master' into develop