Fixed demo project
Merge pull request #609 from lossyrob/refactor/datasource

Fixed demo project