Issue #16 fixed