Update 22
Merge pull request #1 from rikachka/branch3

Update 22