merge with kelonye/handlebars; added tests
clean
clean