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

Conflicts:
	test3.php
Issues #63
Merge pull request #51 from hiroto-exp2/master

63