closes #92 and #93