1.38 updates
Merge pull request #39 from vahidhedayati/master

1.38 updates