Merge pull request #2 from Progroep/gh-pages

Update the master branch
Update van Imac
Merge pull request #3 from gouwestadmm/master

Update from Imac in original repo
Merge pull request #4 from Progroep/master

Gh-pages update