closes #59 closes #60