fix #52
also fix for custom handlebars helper
Merge 7f63be4908e22dbc39df7c9e3d2da6ffc1d4c0f5 into 74124ef01ae8007e886fc086cbf34c8822a5ef7f