Did some stuff.
Merge pull request #29 from niels900000/master

Fixed some things and added some things.