Fix bugs
Merge pull request #2 from navasmdc/master

Fix bugs