closes #228