closes #114 closes #118