Merge changes for pattern search
Overlapping molecules: sigma definition instead of fixed mass