Fixing up the handling of the data source
Merge pull request #15 from hohonu/develop

Fixing up the handling of the data source