Possible fix for #13
Possible fix for #11
Possible fix for #12
Delete dataSources.xml

Cleanup
Merge branch '0.1_bugfixing_and_enhancements'
Merge remote-tracking branch 'origin/master'