Merge pull request #2 from MyTeam7/dilanka

2nd merge
Merge pull request #4 from MyTeam7/Aruna

new merge ghgh