Use short echo tags
Merge pull request #37 from danilms/using_short_echo_tags

Use short echo tags