changes from florin-wrk on Sat Apr 20 23:46:28 EEST 2013