updated for 2.4.4
updated for 2.5
Merge pull request #1 from kewlbear/master

merge from the major github repository