changes from florin-wrk on Thu Apr 18 19:20:46 EEST 2013