修复客户端OOM问题. Fixed #25
Merge remote-tracking branch 'origin/master'