fixes #41 closes #16