Improved the build system
Added openSurfMatcher