Closes #113 closes #95