Ex 1.2
Merge pull request #2 from GusTheSadGeek/master

Ex 2.1