crashing version of server
Merge branch 'master' of https://github.com/ZimonD/ContextCG7