Gitignore
Added base path option
Merge remote-tracking branch 'origin/develop' into develop-MDP