small improvements to url-handlers
Merge pull request #85 from kipe/handlerfixes

small improvements to url-handlers
Merge remote-tracking branch 'upstream/master'