Issue #10 fixed
Issue #10 fixed