Merge pull request #1 from agarfinkel2013/master

updates
5.22 done
Merge pull request #3 from nsainati/master

new code end of 5.22