#18 issues solucionado

Solucionando issues #18