Homepage load fix
Merge pull request #25 from JRogaishio/dev

Homepage load fix