Updated version.
Fixed merge.