Merge pull request #1 from survalyzerphilipp/feature-branches

a little change
Merge pull request #2 from survalyzerphilipp/master

Merge pull request #1 from survalyzerphilipp/feature-branches