changes from florin-wrk on Fri Apr 19 15:11:02 EEST 2013