fixes #32 closes #30