changes from florin-wrk on Wed Apr 17 09:35:19 EEST 2013