Merge pull request #213 from dejan-brkic/master

CRAFTERCMS-799