closes #152