concerning #950 1
Merge pull request #951 from luixxiul/development

concerning #950 1