Extend gitter repository
Improved error handling
Use proper opening tag for config file