closes #274 closes #272