Route annotation schemes and host support
Merge pull request #560 from mente/22-annotation

Route annotation schemes and host support