damn, wasn't perfect. Must be now though...
Merge pull request #6 from meshy/testbranch

@Meshy muwahaha the powaaaah