changes from florin-wrk on Thu Apr 18 12:06:07 EEST 2013