Merge pull request #27 from markmcclain/havana

make nvp wrapper compatible with Havana
more fixes for compatiblity with Havana