Merge pull request #1 from amanmohla/master

Config file changes and Read Me changes
Dockerfile fixes