misc
Merge pull request #1029 from luixxiul/development

misc