rewritten, etc
Merge pull request #938 from luixxiul/development

rewritten, etc