changes from florin-wrk on Sun Jun 2 10:08:02 EEST 2013