changes from florin-wrk on Tue Apr 16 23:25:13 EEST 2013