MAGE-471: added slightly modified changes again
Merge pull request #3 from AOEmedia/MAGE-471

MAGE-471: added slightly modified changes again