Merge branch 'master' into CodeIgniter_refactor
did some code alignment
Merge branch 'CodeIgniter_refactor'