Merge pull request #19 from lianqin7/master

pr form lianqin7
Merge pull request #1 from aralejs/master

Merge pull request #19 from lianqin7/master