Issue 97

Fixes for https://github.com/jmmv/kyua/issues/97