Merge pull request #6 from Webiny/master

master merge