changes from florin-wrk on Thu Apr 18 18:25:28 EEST 2013