closes #1030
Merge branch 'master' of github.com:spumko/hapi into issue/1042