Merge pull request #7 from hennevogel/master

Minor features/fixes
Merge pull request #8 from openSUSE/master

Merge what happened on the live instance