changes from florin-wrk on Sun Apr 14 21:39:48 EEST 2013