Merge pull request #8 from feg-stuttgart/beta

Update includes