minor
Merge remote-tracking branch 'origin/master'
Merge branch 'gh-pages' of https://github.com/MichaelFrohberg/advanced