Rewrite and add to architecture chapter
Merge branch 'master' into gh-pages