changes from florin-wrk on Sat Apr 20 23:59:07 EEST 2013