Fixed bug in URL generation with duplicated / reported in Issue #66
Merge from master