Closes #302