Updating with new features (handlebars) from demo/basic.