Included sampling appraoch
added Ferrari-Canny code
merge fix