concerning #950
Merge pull request #969 from luixxiul/development

concerning #950