#5
Merge branch 'issue#5'

Conflicts:
	hoge.js