Minor changes
Fixed local merge problem and maked own code up-to-date