Fix DYLD search path and add workon/workoff
Merge