closes #135 closes 113#