Combined analysis fixed

Fixed bugs in the inpainted option, generalized overloading of
colocation functionality and finally added multi-files combined
analysis.