changes from florin-wrk on Sat Apr 20 14:52:22 EEST 2013