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

concerning #950