closes #237