Merge pull request #184 from dobau/master

Change url from joscha.github.com to joscha.github.io
Merge branch 'master' into 2.3.x