Merge with master checked and corrected