Typo
Changed Emoticons regexp customization
Added support for conditional comments in templates