Merge branch 'master' into python_dev

.gitignore

+### VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+
 ### Python
 # Byte-compiled / optimized / DLL files
 __pycache__/