Issue #121
Merge pull request #66 from hiroto-exp/master

#121
Merge issue #121 and #123
Merge branch 'master' of git://github.com/2ga/exp1

Conflicts:
	test2.php