bugfix on master
Merge pull request #6 from t-matsuno/hoge

bugfix on master
Merge branch 'master' into feature_2

Conflicts:
	README.md