cristicbz Merge pull request #108 from cristicbz/ecs …