Merge "New feature request: example 3"