closes #167 closes #170