diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fd92695..d801f0a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,6 +5,9 @@
 	],
 	"service": "workspace",
 	"workspaceFolder": "/workspace",
+	"workspaceMount": [
+		"src=${localWorkspaceFolder},dst=/workspace,type=bind",
+	],
 	"shutdownAction": "stopCompose",
 	"extensions": [
 		"ms-vscode.cpptools",
@@ -14,6 +17,18 @@
 		"redhat.vscode-xml",
 		"actboy168.tasks",
 		"brpaz.file-templates"
-    ],
-    //"appPort": [80],
+	],
+	"settings": {
+		"python.pythonPath": "/usr/bin/python",
+		"python.linting.pylintEnabled": true,
+		"python.linting.enabled": true,
+		"python.linting.pylintArgs": [],
+		"python.autoComplete.extraPaths": [
+			"/opt/ros/kinetic/lib/python2.7/dist-packages"
+		]
+	},
+	"remoteEnv": {
+		"PYTHONPATH": "/opt/ros/kinetic/lib/python2.7/dist-packages"
+	},
+	//"appPort": [80],
 }
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bcfc0db..6d2d570 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     - "3001:3000"
     - "3002:8888"
     volumes:
-    - workspace:/workspace
+    - .:/workspace:cached
     - ~/.gitconfig:/home/developer/.gitconfig
     environment:
     - DISPLAY=:0