changes from florin-wrk on Fri Apr 19 13:31:08 EEST 2013