change host on config file
merge master