#198 Fix broken url tags
Merge branch 'version2.0' into version2.1