Merge pull request #10 from tomasbjerre/master

Tests are green :)