changes from florin-wrk on Fri Apr 19 13:38:21 EEST 2013