Merge pull request #12 from SpaceK33z/master

Hele kleine fixes
Merge pull request #15 from SpaceK33z/development

Merge pull request #12 from SpaceK33z/master