This closes #326