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