changes from florin-wrk on Thu Apr 18 18:22:35 EEST 2013