branch merge
extra comment in setenv
updated changeLog and version information