Issue #9 resolved