correction - last add of variables.cpp was not updated
removed possible seg fault
Merge branch 'master' into parallelized