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