changes from florin-wrk on Sun Apr 14 22:24:33 EEST 2013