Resolved #38 and #43