update from my_dev
Merge pull request #11 from sryoji/dev

update from my_dev