Added support for % hosts

Fixes #23