Issue #5 is fixed