changes from florin-wrk on Fri Apr 19 13:37:24 EEST 2013