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

Tofe/work
Just type should be with ... instead of . 

Made it the same as in legacy with ... instead of .
Merge pull request #84 from Herrie82/patch-3

Just type should be with ... instead of .