Updating to master and adding a routing example