pipeMerging
fixed final problems with pipe merging
Merge branch 'pipeMergin'