Datasource refactor
Merge pull request #1 from openfurther/1.4.2-SNAPSHOT

Datasource refactor