修复 #49 #50

closes #49
closes #50

Signed-off-by: liuyanghejerry <liuyanghejerry@126.com>