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

Tofe/work