Added dynamic environment support as an example.
Fixed merge conflict.