URL parser reqritten
Signed-off-by: Oliver Lorenz <olli@olorenz.org>