Fix solution presentation
Merge branch 'master' into solution