merge test2.php from develpment branch to master