fixing bugs
Merge pull request #29 from MiguelABarbosa/miguel

fixing bugs, I got the last bug.