home page done
Merge branch 'issue-64' into develop