Maj check + cober
Merge pull request #64 from Mouii/checkcober

Maj check + cober
Resolve Conflict