Merge pull request #11 from tharindu1st/master

Testing edits
Code Quality and formatting edits done
Merge pull request #19 from rmmpremaratne/master

Please pull