closes #43 and #44