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