Merge pull request #2 from feg-stuttgart/beta

submodule
submodule
Merge pull request #3 from feg-stuttgart/master

submodule