Merge pull request #22 from mershack/master

Update on dataSource
.
Merge remote-tracking branch 'upstream/master'