Implement requested URL changes
Make nginx url matching more strict
Merge pull request #212 from timdegroote/fix-weird-urls

Looks good, merging!