changes from florin-wrk on Wed May 29 10:24:32 EEST 2013