merging branches

Hi rdolgushin I would like to merge the two branhces because I found your updates very useful.