Merge pull request #40 from rmmpremaratne/master

config changes
changes done
Merge pull request #41 from rmmpremaratne/master

configuration changes
Merge pull request #10 from tharindu1st/master

comments revised