Updated to work with and without blaze
Merge pull request #29 from tmeasday/master

Updated to work with and without blaze