Issue #8 resolved