Added a web page
Bug fixed v1.1 for website
Merge branch 'master' into version_2

Merge to use the bug fix
Final version_2