[develop]update
[develop]update
[develop]update
Merge pull request #4 from tottori/master

merged
Merge pull request #5 from tottori/develop

merged