Simplify Server derivation
Merge branch 'master' of https://github.com/fernancoder/DaeWork