Closes #315