Merge pull request #9 from tharindu1st/master

Testing edits
configuration changes
Merge remote-tracking branch 'origin/master'
Merge pull request #40 from rmmpremaratne/master

config changes