closes #138 closes #140