changes from florin-wrk on Sun Jun 2 21:54:05 EEST 2013