Applying original patch after conflict cleanup
Merge pull request #54 from vilda/datahub

Applying original patch after conflict fix