Merge pull request #14 from oshimayoan/master

backup
Merge pull request #15 from oshimayoan/backup

Merge pull request #14 from oshimayoan/master