add geometry to base matcher
Change plugins names
add flags for geometry
clean-up
Merge pull request #126 from dildick/master

Clean-up