Latest changes.
Changes
Fixes :o)
Fixed merge issues.