Closes #324