pull request 03
Merge branch 'master' into pullreq03

Conflicts:
	README.md
Merge pull request #3 from s-toshimi-2/pullreq03

pull request 03