Working on sol 5
Fixed errors
Merge branch 'master' into gh-pages