closes #32 closes #13