minor
Merge remote-tracking branch 'origin/master'
it is necessary, just it!
edge detector updated to support mac
combine hog and contour feature