trying to resolve conflicts
Merge pull request #10 from hashinisenaratne/master

trying to resolve conflicts