subiendo cambios andres parada
Merge branch 'master' of github.com:angelbotto/konrad-example