Merge pull request #110 from juancjara/master

fast fixed
Merge pull request #111 from juancjara/master

Development
Merge pull request #112 from juancjara/development

Development