Changes made by Dejan Špegar (dspegar@execom.eu).