edit2 dev branch
Merge pull request #3 from takanabe/development

edit2 dev branch