closes #61 closes #62