Merge pull request #1 from Zomis/ecs

Ecs
Merge branch 'ecs'