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