changes from florin-wrk on Fri Apr 19 16:08:30 EEST 2013