Merge pull request #240 from luixxiul/development

Development
Merge pull request #242 from luixxiul/development

Development
corrected
Merge branch 'post' into development