changes from florin-wrk on Fri Apr 19 13:28:43 EEST 2013