Merge pull request #1 from JonNatanael/master

Cookiji