Merge pull request #218 from ynput/bugfix/unset-entity-parent-if-pare…

Merge pull request #218 from ynput/bugfix/unset-entity-parent-if-pare… #95