server modif - fix - no segfault
Merge branch 'develop' of https://github.com/janteuni/Zappy into develop