merge upstream
so logo much wow
Merge pull request #4 from neraken/master

So logo much wow