enabled multiprocessing; unmessed git branch merge