Merge pull request #200 from dejan-brkic/master

CRAFTERCMS-759