Bits lost during the merge
Merge pull request #2 from aoehmichen/master

Bits lost during the merge.
Merge branch 'origin/master'