merge with the Anorexic-Server (v.0.6.0)