Closes #344.