Minor style fix
fix a compile warning
Merge pull request #50 from huahang/patch-2

Minor style fix
Merge pull request #53 from huahang/patch-5

fix a compile warning
Merge remote-tracking branch 'upstream/master' into dev

Change-Id: I883189d6c4de0a55917a549ac0d5997f302ff326
Signed-off-by: liuhuahang <liuhuahang@zerus.co>