Merge pull request #2 from droyd/hybrid

Hybrid