Implemented the code completely
Merge branch 'Develop' of https://github.com/danielcarrasco/tandero into Develop
Merge branch 'Develop' of https://github.com/danielcarrasco/tandero into Develop