closes #231