Fix bug with URLs being simplified when shortening
Merge branch 'hotfix/0.3.3'