closes #38 and #32