closes #37 and #38