issue#9

PR for https://github.com/gardr/host/issues/9