Fixes #24 closes #26