fixed errors
qMerge branch 'master' of github.com:TLiang518/SadTerry
Merge branch 'master' of github.com:TLiang518/SadTerry