fixes #3, closes #8