changes from florin-wrk on Thu Apr 18 11:55:17 EEST 2013