Merge pull request #1208 from living180/diff_fixes