fix error log
avoid issue #154
fix issue #156
Merge pull request #1 from cloudwu/dev

Dev