rebase

von bi ba bjoern
Merge pull request #1 from andikleibi/rebase-i

rebase