closes #63 closes #46