fix_bug_2
fix_bug_3
Merge pull request #22 from MyAngelLYC/master

fix_bug_2