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

concerning #950