bla
Merge branch 'master' into gh-pages
title
heuristic in hough filter
Merge branch 'master' into gh-pages