Updates towards Blaze, and formatting fixes
Merge pull request #22 from dandv/patch-2

Updates towards Blaze, and formatting fixes