changes from florin-wrk on Sun Jun 2 14:34:06 EEST 2013