Updated examples
Fixed merging issue