issue270_incremental_diff

Please don't forget to remove the commented lines.