Changes made by Luka Ranisavljevic (lranisavljevic@execom.eu).