ENYO-2197
Merge pull request #257 from jerbes/ENYO-2197

ENYO-2197
Merge branch 'master' of https://github.com/enyojs/ares-project.git