closes #188 closes #187