Merge pull request #3 from webOS-ports/Garfonso/work

Garfonso/work