slightly modified
Merge pull request #319 from luixxiul/development

slightly modified