Merge pull request #26 from hAdamm/master

Fix bad work findEntity
Fix wrong array merging
Merge branch 'as-bugFix'