changes from florin-wrk on Thu Apr 18 19:12:23 EEST 2013