Merge pull request #29 from rmmpremaratne/master

Code inspection done.
changes done
Merge branch 'master' into old-state
changes done
Merge pull request #5 from tharindu1st/master

Merge pull request #9 from tharindu1st/master