changes from florin-wrk on Mon Jun 3 23:18:11 EEST 2013