Fixed backup when using different hostname
Merge branch 'hotfix/0.1.2'