resolved thilina's conflicts
Merge pull request #21 from Thilina123/master

resolved thilina's conflicts