Merge pull request #202 from dejan-brkic/master

CRAFTERCMS-768