DataSourceHandler is now more abstract
Added code comments and improved error tests
Readme updated