closes #348