make nvp wrapper compatible with Havana
Merge pull request #27 from markmcclain/havana

make nvp wrapper compatible with Havana