Merge pull request #114 from dejan-brkic/master

CRAFTERCMS-440