Merge pull request #2 from jereln/master

Merge pull request #1 from jereln/static_page
Merge pull request #3 from jereln/static_page

Merge pull request #2 from jereln/master