Fixed origin url in some cases
Merge branch 'hotfix/0.2.7'