Issue #16 in progress