Changes made by Nikola Milanovic (nmilanovic@execom.eu).