changes from florin-wrk on Thu Apr 18 23:14:17 EEST 2013