1.22 updates
Merge pull request #22 from vahidhedayati/master

1.22 updates