fixes #27 closes #33