Merge pull request #1 from Avans/master

update
Merge pull request #2 from Avans/master

update
some fixes
some more
some more
even more
Merge pull request #9 from jagit684/master

some fixes