Closes #323