merge Develop to master

all directories are parameters now