changes from florin-wrk on Fri Apr 19 12:28:35 EEST 2013