closes #347