Fixing stuff ?
Merge pull request #10 from Raynos/master

Stuff.