updated for 2.5.1
Merge pull request #2 from kewlbear/master

updated for 2.5.1