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