closes #35, fixes #34