closes #48 and #47