Updating server with Maurizio's code.
Merge pull request #2 from menivaitsi/server-update

Updating server with Maurizio's code.