v9.17 closes #102 closes #103