Commiting so I get latest code at home
Fixed conflicts