ticket 230
urls
Merge pull request #252 from mwernimont/master

ticket 230