Supporting our new address - localshot.org.il
Merge branch 'hotfix/0.6.1'