Merged with master #108
Replace SimpleMappingManager by ConnectorMapping one #108
Fix SimpleMappingManager in spec #108