Merge pull request #2 from cubejs/master

rebase
~ 0.4.14
Merge pull request #33 from inexplicable/master

~ 0.4.14