Changes from lab 2 (part 1)
Merge remote-tracking branch 'jaume/master'