fixes #8, closes #8