Last changes to version 1
Fixed merge error