changes from florin-wrk on Wed May 29 10:44:12 EEST 2013