issue #37 and issue #38 fix with tests