changes from florin-wrk on Fri Apr 19 19:00:42 EEST 2013