Update to version 4.5
Merge previous changes