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

concerning #950