stupid pcl
Merge branch 'master' of github.com:anoukv/ComputerVision
fixed at least one bug in merge2