bug fixes.
problem with diff calculation continue to exists
Merge remote-tracking branch 'origin/master'