bug fix
Merge pull request #5 from xu-cheng/master

Several fix