changes from florin-wrk on Thu Apr 18 15:36:56 EEST 2013