Simplify createRoute and provide full normalization, fixes #118
Merge remote-tracking branch 'remotes/upstream/master' into thorn0-fork
build