closes #234