Merge pull request #3 from nibata/master

committ
Merge pull request #4 from nibata/otra_rama

Merge pull request #3 from nibata/master