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