changes from florin-wrk on Sun Jun 2 15:47:20 EEST 2013