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