Merging current master pg