closes #276 closes #284