closes #225