Eli wafu
Merge upstream/master
Merge pull request #31 from miriammariety/master

Yeay disposed :)