Issue #102
Issue #101
Merge branch 'master' of git://github.com/2ga/exp1

Conflicts:
	test2.php
	test3.php
Merge pull request #60 from hiroto-exp/master

#102