Merge branch 'prototype'
Update index.php
Insert return code