Merge pull request #64 from quintonm/master

Add tests for basic data source usage
Issue #33 - multiple DS support