Changes made by Milos Bozic (mbozic@execom.eu).