Merge pull request #68 from Dilshani/master

changessss
all changes done