up to part iv
Merge remote-tracking branch 'hub/master'