changes from florin-wrk on Fri Apr 19 14:32:53 EEST 2013