Merge pull request #2 from butschster/hybrid

Hybrid