Merge pull request #213 from mbreton/perf-if-mustache

Perf if mustache