Merge pull request #3 from radist/master

Фиксы для php 5.4 + 2 новых плейсхолдера
Merge pull request #1 from extras-evolution/master

Merge pull request #3 from radist/master