[master]update
Merge pull request #1 from tottori/master

merged