Merge pull request #58 from luixxiul/development

Rewrote, comte & descartes
Merge pull request #62 from luixxiul/development

Development