Issue #17 fixed