Commits aanpassingen
Merge pull request #2 from Redmaner/master

Add upstream changes
Merge pull request #45 from Cueie/master

Changes for this week