Some optimizations
Merge branch 'master' of github.com:rockyhe/rockykevinleon