Added support for comments syntax with {# ... #}.
Merge remote-tracking branch 'origin/master'