R1:4fac86c5134d

Merge pull request #16 from hsb/master

Fixes for the project page