Merge pull request #8 from feg-stuttgart/beta

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

submodule