Issue #4 resolved