changes from florin-wrk on Wed May 29 09:38:41 EEST 2013