Merge pull request #8 from feg-stuttgart/beta

Update includes
Merge pull request #9 from feg-stuttgart/master

Merge pull request #8 from feg-stuttgart/beta