fixme: handle garbage entities
Merge pull request #7 from hendrikheller/master

fixme: handle garbage entities