closes #41
fixes #42