changes from florin-wrk on Sun Jun 2 14:45:19 EEST 2013