Merge pull request #1 from aralejs/master

merge master
fixed #43
Merge pull request #48 from lianqin7/master

fix #43 & #47