Merge pull request #8 from MartijnSch/urls

Create an extra view for urls, update tests
Merge branch 'master' of https://github.com/MartijnSch/marusem into urls