Just in time creation of datasources
Merge pull request #5 from cclauss/patch-4

Just in time creation of datasources