Added changes from Gregor Anželj.