Merge pull request #324 from ping19/master

Entities clearing