Fix bug in URL generation.
increment version.
Fix conflicts. Merge.