Merge pull request #6 from Webiny/master

Copied changes from the master repo