Victor

Merge Victor's changes with master.