Close Issue #16 and #38