Beginning to work on niczak/Handlebars#7
Wrapping up changes, closes niczak/Handlebars#7