Fixed #84
Implemented support for different DataSource types.
Merge pull request #93 from marklagendijk/master

Fixed #84