Fixed some errors
Merge pull request #277 from JoseRodriguezBueno/master

Fixed some errors