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