Rest of the Code-Optimization.
com.jemge.core untouched.
Merge remote-tracking branch 'origin/master'
Merge pull request #14 from Shinigami92/master

Rest of the Code-Optimization.