Issue #9 fixed
Issue #4 fixed