Merge pull request #6 from camohub/master

from master to test branch
Update index.php
Merge pull request #7 from camohub/test-branch

Test branch