merging
Merge branch 'Version_0.3' of https://github.com/hugojf/surfExtractor into Version_0.3