Fix2 index.php
Merge branch 'fix2' into dev