changes from florin-wrk on Sat Apr 20 14:34:30 EEST 2013