fixing bugs
Merge remote-tracking branch 'origin/diffProcess' into diffProcess