fix #42
men commit
Merge remote-tracking branch 'origin/master' into 20141106_men

Conflicts:
	README.md
men commit3
Merge pull request #47 from kou-ishizaki/20141106_men

fix #42