changes from florin-wrk on Thu Apr 18 11:54:22 EEST 2013