changes from florin-wrk on Sat Apr 20 12:29:28 EEST 2013