Merge pull request #148 from clinuz/master

WAIT ON POST 2.2 MERGE

Reviewed-By: Ben Combee (ben.combee@lge.com)