changes from florin-wrk on Sun Apr 14 23:18:35 EEST 2013