Tests are green :)
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from tomasbjerre/master

Tests are green :)