Merge pull request #3 from jarno100/branchb

Merge pull request #2 from jarno100/master
Merge pull request #4 from jarno100/master

merge xd