Removed test.php
Merged different sources