Merge pull request #5 from tharindu1st/master

dss api core changes
code formatted and run findbugs
Merge pull request #4 from madusankap/master

please pull