Merge pull request #2 from Webiny/master