Fixed some minor bugs :P
Merge pull request #16 from jlburgos/master

Fixed the errors again.