closes #173 closes #169