closes #201 and #205