Issue #8 partially resolved