roughly merged
Merge pull request #8 from KensakuKOMATSU/dev_proto1

roughly merged