fixes #60 closes #54