changes from florin-wrk on Sun Jun 2 14:20:18 EEST 2013