Update to several files
Merge pull request #10 from ItsAsbreuk/master

Update to several files