Rest of the Code-Optimization.
com.jemge.core untouched.
Merge remote-tracking branch 'origin/master'