Merge branch 'f-mengqiaos-diagrams' into dev

finishes Github Issue #40.