Update
Url update
Merge pull request #1 from Progroep/master

Update the master branch
Merge pull request #2 from Progroep/gh-pages

Update the master branch