Merge pull request #1 from webOS-ports/tofe/work

Tofe/work