changes from florin-wrk on Sun Jun 2 15:45:14 EEST 2013