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

Tried to fix again...