Added SURF and SIFT in nonfree