Merge pull request #4 from tharindu1st/master

Testing edits
Code inspection done
Code inspection done
Merge pull request #29 from rmmpremaratne/master

Code inspection done.