Commiting code from Episode 6.
Merge remote-tracking branch 'origin/master'