Fixing issue with getting current URL
Merge branch 'develop'