Merge pull request #18 from clinuz/master

simplify and update
Merge pull request #19 from clinuz/master

Cleanup
update to reflect changes in enyo

Enyo-DCO-1.1-Signed-off-by: Cole Davis <cole.davis@lge.com>