ObjectMerger: fixed most of the bugs
Merge branch 'master' of github.com:vogelsgesang/upc-od