Tried to fix again...
Merge pull request #5 from olivervscreeper/dev

Tried to fix again...