Closes #348