Testing some stuff.
Merge branch 'master' of github.com:jeroen/jeroen.bz

it message to explain why this merge is necessary,