refactoring source code
Merge branch 'master' of https://github.com/nghe-tc/nguoisaigon