2nd commit

for branch fmielke
Merge pull request #1 from fmielke/fmielke

2nd commit