changes from florin-wrk on Sun Jun 2 15:24:59 EEST 2013