closes #232