Merge pull request #59 from dejan-brkic/CRAFTERCMS-212

CRAFTERCMS-212
Merged
Merge pull request #60 from dejan-brkic/CRAFTERCMS-214

CRAFTERCMS-212; CRAFTERCMS-214
Merged