Merge branch 'hotfix/0.1.5'
Fix creating of urlset
Merge branch 'hotfix/0.1.6' into develop