web page structured
Merge branch 'issue-11' into develop