Fix BUGs 1
Fix 2
Merge branch 'master' of https://github.com/hqt/HopAmChuan