closes #215 closes #214