Re #43. Cambios en algunos lados, y caso de uso terminado
Merge branch 'development' of https://github.com/sbianchi/wira into development