fix for buildUrl
Merge branch 'develop'