changes from florin-wrk on Thu Apr 18 23:13:26 EEST 2013