Merge branch 'hotfix-0.1'
Finalise new hoster changes
Merge branch 'hotfix-0.2' into develop