added machine-spceific information
merge parallel versions