changes from florin-wrk on Thu Apr 18 12:29:02 EEST 2013