closes #262 closes #253