Merge pull request #6 from jaake/master

...
Merge pull request #7 from jaake/info_page

Merge pull request #6 from jaake/master