Added some more exercises
Merge branch 'master' into initial