Catching up on the changes

Merging with latest version.