Issue #113
Issue #114
Merge task #151 and #113
Merge task #152 and #114
Merge branch 'master' of git://github.com/2ga/exp1

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

#x3,#x4