testing opencv stuff
Merge origin/master