bug repaired
Merge branch 'master' of github.com:AllenTung/First_Try