update to latest 2.5 changes
Merge pull request #16 from garak/patchona

update to latest 2.5 changes