changes from florin-wrk on Sun Jun 2 22:30:14 EEST 2013