changes from florin-wrk on Sun Apr 21 15:29:37 EEST 2013