Shell Importer
.gitignore modification
Merge origin/master