Closes #344