Armindo branch

Updates with Wim's commits.