Made safe.php safe :)
Merge