updated to 1.24.2 upstream version
Merge pull request #2 from tisoft/master

updated to 1.24.2 upstream version