changes from florin-wrk on Sun Jun 2 22:13:22 EEST 2013