closes #229