Closes #303