fixes #21, closes #21