Adding support for Hybrid mode
Merge pull request #766 from arthurbenemann/issue765

Adding support for Hybrid mode