refactoring the code
Merge branch 'master' of https://github.com/phg1024/CSCE647