Blaze compatibility
Merge pull request #141 from Tarangp/master

Blaze compatibility [WIP]