weber into 2 parts
Merge pull request #1042 from luixxiul/development

weber into 2 parts