update from my_dev
Merge pull request #9 from sryoji/my_dev

update from my_dev