URL more flexible
Merge pull request #26 from mdahm/master

URL more flexible