resolve #42 issue
Merge pull request #69 from nancoil/master

resolve #42 issue