merge from simpleserver