Issue #5 partially solved