@adamwathan Routing Fixes #20 and #12