added documentation
Merge branch 'philip' into merlijn
Merge remote-tracking branch 'origin/merlijn'