closes #375