Merge pull request #7 from dejan-brkic/master

CRAFTERCMS-547