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

Tofe/work