changes from florin-wrk on Sat Apr 20 23:51:03 EEST 2013