Merge pull request #1 from jakitofilm/master

Mess