DataSource and XADataSource
Merge pull request #49 from jesperpedersen/ds

DataSource and XADataSource