Updating files c4 and 5 still to do
Merge branch 'master' into gh-pages