Merge pull request #17 from asankasanjaya/master

DataAgent merge
patch 04
patch 05
Merge pull request #18 from Dilshani/master

patch 04
Merge pull request #19 from Dilshani/master

patch 05
patch 06
Merge pull request #20 from Dilshani/master

patch 06
sdfa