Some changes
Some changes - SecondClass
Merge remote-tracking branch 'origin/master' into feature#1