changes from florin-wrk on Sat Apr 20 14:48:35 EEST 2013