Mistakes in Caipei`s commit fixed
Merge pull request #14 from dzdidi/bug_fixing

Mistakes in Caipei`s commit fixed