changes from florin-wrk on Fri Apr 19 23:35:34 EEST 2013