changes from florin-wrk on Fri Apr 19 19:20:55 EEST 2013