fixed issue Issue #40 and e Issue #38