closes #35 closes #34