changes from florin-wrk on Fri Apr 19 18:06:19 EEST 2013