Update PServer from iit-Democritos master