Merge pull request #4 from feg-stuttgart/beta

Beta
Merge pull request #5 from feg-stuttgart/master

Merge pull request #4 from feg-stuttgart/beta