fix bug
Merge branch 'master' of https://github.com/zhangkaitao/es
fix issue#37
fix issue#40
fix issue#43
fix issue#44