Issue #7 resolved