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

Conflicts:
	test2.php
Merge pull request #67 from hiroto-exp2/master

#123