Merge "Adding an charm generator"