Reorganized stuff:
Added the circle detector