Merge pull request #6 from Webiny/master

Copied changes from the master repo
Merge pull request #7 from Webiny/1.0

Merge pull request #6 from Webiny/master