Added first code batch
Merge remote-tracking branch 'origin/master'