changes from florin-wrk on Wed May 29 09:54:10 EEST 2013