Merge pull request #3 from feg-stuttgart/master

submodule
submodule
submodule
Merge pull request #4 from feg-stuttgart/beta

Beta