Merge branch 'feature/indexHtml'