changes from florin-wrk on Thu Apr 18 12:57:53 EEST 2013