closes #34