Merge "Updated the sample"