commit
Merge pull request #5 from sumimasahiko/feature/gh-2

commit
Merge branch 'master' into 3.1/develop

Conflicts:
	README.md