changes from florin-wrk on Sun Jun 2 00:36:07 EEST 2013