Merge pull request #19 from Webiny/master

Minor code refactor
Merge pull request #20 from Webiny/1.0.0-RC1

Merge pull request #19 from Webiny/master