additions to task 10 details
Merge remote-tracking branch 'upstream/master'