Merged fix from branch
Merge branch 'allfixes' of https://github.com/angelxmoreno/datasources into allfixes