closes #60 closes #63