changes from florin-wrk on Fri Apr 19 12:22:13 EEST 2013