Test.c modified to test the 7cm distance.
Fixed merging issues