Fix docker error and issues
Merge pull request #26 from rajthilakmca/master

Fix docker error and issues