commit 3.1/develop
Merge branch 'master' into 3.1/develop

Conflicts:
	README.md
Merge pull request #6 from sumimasahiko/3.1/develop

commit 3.1/develop