Update diagram to fix #136
Merge pull request #178 from progit/diagram-update

Update broken diagram
Merge remote-tracking branch 'upstream/master'