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