changes from florin-wrk on Thu Apr 18 19:43:49 EEST 2013