closes #129 closes #128