Little Changes
ClassTemplate
Merge remote-tracking branch 'origin/master'