Close #38
Merge branch 'home-page' into development