Issue #15 fixed