changes from florin-wrk on Thu Apr 18 12:06:59 EEST 2013