re #43 - Added Mustache
re #33 - Applying team's feedback