from todo: part a.2, a.3 & a.7
Merge remote-tracking branch 'origin/master'