changes from florin-wrk on Sat Apr 20 00:23:29 EEST 2013