Merge pull request #18 from Webiny/1.0.0-RC1

Merge pull request #17 from Webiny/master
Minor refactors and updates
Merge pull request #19 from Webiny/master

Minor code refactor