Feature/routing bis

This one includes the previous PR from @ocramius but updated to work with annotations.