Merge pull request #1 from smvdu/master

Merge pull request #97 from KodeKracker/master
conflict merge problem
Merge pull request #98 from KodeKracker/master

confilct problem