Merge pull request #8 from vloris/master

Betere file-handling users en links