3 and 4
Merge branch 'master' of github.com:jorgeer/cpp